Handle conflict between team members